Merge tag 'upstream/3.98.5' into debian/master
authorSimon McVittie <smcv@debian.org>
Wed, 5 Aug 2020 20:59:15 +0000 (21:59 +0100)
committerSimon McVittie <smcv@debian.org>
Wed, 5 Aug 2020 20:59:15 +0000 (21:59 +0100)
Upstream version 3.98.5


Trivial merge